Fix a boundary case in scrolling where a tab was not shown. (#168105,

2006-05-19  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_pages_allocate): Fix a
	boundary case in scrolling where a tab was not shown.  (#168105,
	Hiroyuki Ikezoe, patch by Kouhei Sutou)

diff --git a/ChangeLog b/ChangeLog
index cc681e4fa3935b6ebeacf4163839a20e3a35ed88..e5a4786936d9781e6d97165d40da254287769605 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Fix a 
+       boundary case in scrolling where a tab was not shown.  (#168105,
+       Hiroyuki Ikezoe, patch by Kouhei Sutou)
+
 2006-05-19  Damon Chaplin  <damon@gnome.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_init): use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cc681e4fa3935b6ebeacf4163839a20e3a35ed88..e5a4786936d9781e6d97165d40da254287769605 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Fix a 
+       boundary case in scrolling where a tab was not shown.  (#168105,
+       Hiroyuki Ikezoe, patch by Kouhei Sutou)
+
 2006-05-19  Damon Chaplin  <damon@gnome.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_init): use

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index dfef203d6c6e803b48c8ac9f6a30449b7df6233d..12a85bc74b875527e4269a1b9a6f30315c76acaf 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -4851,7 +4851,9 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
                                    &(notebook->first_tab), remaining_space,
                                    STEP_PREV);
 
-         if (*remaining_space <= 0)
+         page = notebook->focus_tab->data;
+         if (*remaining_space <= 0 &&
+             !gtk_widget_get_child_visible(page->tab_label))
            {
              notebook->first_tab =
                gtk_notebook_search_page (notebook, notebook->first_tab,